many updates (some for 24.4)