Woo lots of changes! And some Emacs... :O