Bring back mac stuff, update it selectively to my latest stuff

♥