Fixed opening apk bug and other few changes