Update with new commands, new options and some minor changes