Update models & Podfile.
Also fix up a few swift related errors