slightly improved annotation system. refactored separate methods into one common which is now inside newly created AnnotationController. Also fixes #30 which did not work on newly added annotation.