Several bugfixes with update() implementation.
v1.0.2