Add more unit kinds.
Modify some text.