Various updates

Code Clean Up
Fluid Movement
Collision with mystership