Fixes Collision Bugs and Adds basic Animation