updated with more mac stuff to test