updated: content changes for the new site
added some more fixes that Jim found

(cherry picked from commit f690e77bc4e70254820ddbae32616c223e038361)