Added .osx and fixed stuff