updated; some mac config