1. Add commandline support to change behaviours dynamically
2. minor bugfix