seeder touchups and refactors from pstorm