categories sync correctly on edit of plone object - plus some cleanup and label fixing