Updated PlayerObject and other classes accordingly

Collision and everything should be working.