Lots of fixes to my init.el.