latest updates from personal mac
merged upstream changes