iPhone6 plus fixes

Fixes for #118, #119, and #120.