Even more cmds, more fixes, big fixes, bugs squashed