Add apk and small bugfiz