migrations corrected and models