Documentation improvements (including #2137 fix)