fixed typos, added missing annotations, removed old (commented-out) code
Authored by: mrieser 2010-02-19
Parent: [r10514]
Child: [r10516]