Annotate instance heads fix #45

I am not entirely sure if all class and instance related issues are solved by this but I have found no more.