added OSx config + some more stuff