get rid of some old Passementerie stuff that was commented out
remove some other comments, add some comments