Fixes for Xcode 5

I'm not sure about changing properties from an NSMutableArray to an NSMutableDictionary. It seemed like it was being treated as a dictionary in the code though.