More trace info from m5nr2annot plus a bug fix