Updating: largely cosmetic changes.