Changing zips to run from command line; also bug fixes