Added migrations. Small fixes