Migrations, seed data and minor model fixes