clean ups and tweaks for init.el