Doc cleanup, fixes #424