fixed bugs and added apk extractor