Compiles in Xcode 6, runs on 10.9
More changes