last set of changes on my personal mac, before trying a fresh build on the corp mac