Assorted refactorings; seeds for development database