Final changes to my config for now.