Fixed some rewrites in COMTOR.g