updates to the structure and physics. largely cleanup and simplification.