Added Tom's fixes and updates for the base diagram.
Authored by: hughdo 2009-09-18
Parent: [r10]
Child: [r12]