Fixed refs; added qualifications