Fixed Android Manifest and some minor bugs