Clean up physics and add some bumpers