Adding locking when fiddling with config znodes
removed a couple TODOs
Fix configuration using zookeeper