more fixes to update