reverted everything; fixed some more bugs

re-added acceleration and some other bugfixes from previous commits