migration done, models fixed