individual handers now include :comment, :label, and :annotation frames.

Tests included.