Improved mac support

Improved mac detection, might still not work...