Physics /Logics fixes