daspilker's change requests

I have made the changes that were requested by @daspilker.

Open issue: Documentation