yet another bunch of meaningless fixes and improvements..