Improved character handling.