Validate config
Comments and cleanup