Cleanup.  Added updating many-to-many.