more string and char related fix

ToDo: update mutator-cond and mutator-let macro