Fixed bad programming

Kevin told me to change a bunch of things and I bow down to my master...