Finally got HABTM-relation to work; fixed some issues