fixed fall, cleaned up motion code