Updates including stuff for OS X since I am that cool now