comments and minor modifications to classes mapping references to terms