+ addtl updates for macs
+ MACS working w/ subdir