iphone fixes

iPhone fixes by Nic