moinor improvements to migrations and models, consulted with the team