Merged some OSX-specific stuff in.
Updated comment block.