implemented suggested rephrasing of "annotating everything"; fixes #38