Some small fixes and cleaning up. Seems to work fine on iPhone 6, so I assume the same on the 6+.