And add more consistency fixes.

Created by  David Lawrence Ramsey  on September 25, 2009
LMQIKIR34JPMCEW6E2ITOKLWYB4USI2OQHKIURQKXVEJPL6LEJLAC
Change contents