rename stuff to make more sense
rename variables to make more sense, part 2
improve a couple of variable names