Improve the command-line simulator a bit