update annotated table according to template
small fixes