close #40
Some more commands
Sorted commands in common generator
This looks good!!