renamed join table, cleaned up associations