New control block system
Attempt to prevent bounce going up hill at high speed
Lots and lots of cleanup and fixes