refactoring, minor fiexes to zookeeper things