add comments and build associations