Added final corrections from pull request.