Corrections and other changes up to where curve references become frequent