additions, rationalizations, and fixes to schema and loader--closer to final