Add emacs refactoring (emr), updates