Some general cleanup, adding a --verbose option, etc.