merge some things from my OSX environment