small bugfixes: restore missing dotcontrols/ remove unneeded stuff/typo's.