few minor edits to fix refactoring away from the DBG prefix