more work on command-line interface
update TODO