1. Schema fix
2. Associations: belongsTo fix comments