text fixes

&apos; of doom...
Merged in
https://docs.google.com/spreadsheet/ccc?key=0AvTBixYzbvvCdFdHVnZ0V2FYWVl6ZkU4V1N3blFhNFE&usp=sharing#gid=21