osx-ify and add some comments for myself