Corrections

Corrected a few mistakes from earlier commit, added new parameters (for
full details, see emails w/ Carlos from 6/10 and 6/19).