Fixed physics and cleaned up a bit
Merged