Corrected some errors and added missing entries.
Authored by: Dev 2009-07-31
Parent: [r122]
Child: [r124]