Added some tweaks (taken from @pcarrier's config! :))