update and build-fix cwiid