+ fixed a bunch of bugs caused by the previous commit...
Authored by: bworrell 2011-02-21
Parent: [r977]
Child: [r979]