fixed a few N+1 issues....