Final updates to get this ready for pull request.