added more character processing