update emacsy stuff and some junk