More annot tool impl
General cleanup