Add short names for the commands. Improve command parsing.