Change text units, fix concurrency bug