Cleanup
Add a few opts
Add some command line options
Test a few options