working on iOSApp, minor changes