app id is instrumented into the apk. and other improvements