add migrations + other small fixes
minor fixes
CR fixes