Style fixes, physics improvements