Added character types
Some minor changes