fixed hierarchical graph and minor fixes