added migrations and updated models, fixed some other stuff