merging mgregson's patch to the ssh section and minor typos