Improved iOS performance + fixed null pointer exception