Large number of tweaks and fixes to movement.  Down to 5 failing tests.