fixed a bunch of timing issues and added better modifier transitions