Add some more emacs states
Shuffle loading order, fix obsolete usage