Fixed a big with collision detection and redid some bounds