graph.py: some special cases
make_json.py: buggy condition produced duplicate nodes
measures.py: command-line options
graph.py: cycle checking in add_child(), handle CBBMW nodes from merged annotations, fixes in upward() and downward()