Cleanup

A bug fix or two, moving toward this first release. The executable is
actually up to date with the source now.