clean up, nicer printing, add set of annotated types