Initial support for command arguments and some typo