final fixes and repopulate with seed data