* Fix up schema per Brion's notes