Refactored config parameters
Added branch switching and usage info