added some variables, changed cfs to cfsrr, other minor fixes