added zookeeper reporting, global overrides, comments, cleanup