build-script: more cleanup, some fixes for zip-generating