Fixing some bugs, collision detection still not working