Fixes in graph, parser. Improved simpleEngine