Actually fixed tab/space errors (nice going, mikku), and renamed some things to make more sense