Improvements to new command and argument system.
Added more command and argument templates.