Changed structure..
Seperated/changed physics a little.