Latest changes, just minor tweaks to config files and stuff