Display scale tweaks, notes about iPhone 6
Objective-C style cleanup