Attempted some physics fixes