fixed more problems stemming from the name change take 2