merge
ball boundaries and better steering
mergefix