Fixing issues #8-11

@vokalinteractive/ios-developers Code review? Only about 10% of this is code that I typed, the rest occurred because of Kif in a pod update.