Made some more changes, Emacs acting up