added comments, removed debugging lines
wrote faannotate and tests for it