finishing the s/mac/osx/ conversion