Bugfixes. Added something resembling acceleration... Lots of remnants of bugfixes