Clean up some bugs, add basic usage statement.