Improvements to OS X Port

This should resolve your comments.