improved command mode.