Numerous updates, re-ordering things alphabetically
Fixes to schema? Really need an expert to look over it.
Authored by: antbryan 2009-07-25
Parent: [r356]
Child: [r358]