Fix a bad field assignment
Put variables in the right places, fill some holes in the CSL assignments