Minor changes
Keep the temp directory
More sensible loading of default configuration