Finishing some commenting and building APK