Added a lot more OSX options