xcode changes

squash this one in.  build + runtime tested on osx.