various changes, addition of config