update and comment annotation

also comment ToolbarX