added character class stuff
fixed char merge