Well, I wasn't happy with the way something worked.. So this commit changes that.