Lots of changes, to Emacs and other random stuff