Added License, cleaned up CLI, and tidy up.