Fixes inconsistent variable names causing reference errors introduced by uiuc merge
Removing some debugging statements