minor improvements plus tests on Silk and iOS 5