Add one more tune. Improve error handling. Be less picky about tunes passed on the command-line.