Major Fixes/ Speed and Collision