- tossing out migs

- adds fields
- fixes templates