some cleanup and a pre-publish crew_member fix