Updated version string.
Various refinements.