More work on the basic commandline stuff.

Also updated the notes a little bit.