some update fixes and tests