bugfix and some Xcode6 updates