I made some changes to 2c, but mostly undid them. I haven't updated cnqr2 for a while, so I am backing that up.