Made cursory changes here and there.