Pushing FPS limit change ahead early, still need to fix edge bug.
Added better collision detection