Minor fixes, drafting for a new command.