Minor additions and re-organization.
Re-organization.