renamed correctly
added emacs lib stuff