Better handling of space after words