Minor changes and license headers.