touchups and master branch on osx