+ fixing migrations pt1
+ migrations fix pt2