updates for 24.4, some general and face changes