corrected a couple more problems