A bunch of changes and I sort of fixed some of the odd physics issue partially.