More tweaks before go live (and an SQL schema)