Fixes to camera and physics
Merges and merges