Latest iOS update

Keeping the code up-to-date with Bruce's.