updated models and fixed migrations