added new triples, changed output format, many minor changes