smarter whichways behaviour, couple of small bugfixes