fixed some minor bugs and changed config-examples accordingly