fixes and incoming from pucatrade
updated a sets for a few wants