Fixes some associations #138
Fixes index