added migrations and changed a few things