Correct some documentation and a string name according to the comments by Tom