Tweaked the movement type check to be slightly more restrictive (there's at least one new type that's used that shouldn't be counted here; 4).
The speed of object NPCs (not that it should matter to anything I'm aware of) should now be accurate.
Fixed a bunch of timing issues.