Updated documentation

Did some changes according to the pull request comments.