Refactoring, and added in notes for iOS 7+ and WAL