improved mac support