Updated Annotator + DTM (debug and error checking)