Minor documentation and code changes