changed handling of some characters