Tidy up some config options and add basic directory creation.