fix piston
nigel fixes, remove userprefs from commits