fix model associations for join table and fix table typos with new migrations