cleanup and annotations, ManyToMany craziness