housekeeping and add zip-check