Add basic usage info, make some code cleanups.