changed migrations and other bugs