WIP: integrate new tags array with comment generator... TODO: fix detection of annotation tags without text on same line