fixes here and there
minor fixes
comments
nested associations working