Better command handling and display.