changes from mac, hope this doesn't mess anything up
merge mac and pull
fixed up some stuff in setup for mac