whole lot of physics fixes