Adding in new /etc/defaults files + various other tweaks