iOS Changes

This includes all changes up to today's merge of Android and iOS.