added beginning of config validator
fixed merge conflicts