Better special character handling.