More fixes suggested by wrb. Double plotting still a problem to be fixed. Need to retest last half of the lessons