more fixes

revert some stuff lost in transition :-)