corrected some of my earlier mistakes