update
update
support for config files/some refactoring