Various changes, bug fixes, etc. to the commands.