bug fixes + added models and removed old migrations