manuscript changes from chicamocha
finished merge from carreau; just manuscript changes