cleanup
Work in progress: added an annotations channel