made Text handling saner and less packing