wip: improving os x port