refactor configuration updates

Use new methods to update configuration methods and add some bug fixes.