minor changes, moved some stuff around, mac stuff