working annotation tagging
some debugging code
cleanup