various fixes tweaks and updates, moving fast so keep upstream up to date