Update doc comments, Fixes #626