aliases + fixed emacs stuff
refactoring