A bunch of updates.
Removing duplicated code in init.el.