fixes some more issues with update
fixes some more issues with update part 2