lots of changes on subcommands arguments definitions; diff and adjust required to be fixed