Change command list, adjust log regexp and shift logging vs doing