Issues and Crashes fixed. NOTE: OSX version has fix not in iOS version