annotate classes and instances, fix #45