New version of my config, added some useful stuff