misc changes...merged after daniels change
Authored by: pauldana 2005-07-29
Parent: [r225]
Child: [r227]