improving physics and general cleanup