Adds CONF_FILE back
Tidies comments