fixed some code and commented others