Small changes and add APK