misc changes, update() not yet tested