updated naming error, new models, migrations, and added relations to models