added configuration file update feature
updated config with update markers, cleanup, code formatting