graphs from predicates, other minor changes