Major changes to init.el