small pulls fixes and apk