more refactoring of physics and triggers; starting to make more sense now