schema modifications

Wanted to put this up for peer review as there's a substantial number of tweaks here. 
Also, do we want to consider validating all incoming data through schema?