more mac improvements