Final cleanup and fixes + APK File