A few minor changes, as well as a bug fix for the Context Related
Synonym Mapper.