Improved physics, collision model. Added friction. Still exists bug with energy transfer
Merge into mainline