osx updates
merged