added option to switch updater branches, some refactoring