Bug fixes + improvements

Please run a 'pod install' before opening the xcworkspace after merging.