More code cleanup
Tweak damping according to my broken physics