Updating: minor fixes.
Updating: merging.