adding mac config + tweaks to win