fix+rework OSX specs and implementation