making a few changes. here and thre.