some minor fixes + starting to add graphs