Updated grapho, minor fixes, merging tree