Changes mostly to do with making the xcode project work