adding migrations and a few changes