update with new fixes