SubCommands rework

and some small edits