fixes and rush checked in... not done with rush.
Authored by: SumolX 2007-02-19
Parent: [r509]
Child: [r511]