Started better handling of non-break spaces