EthanR: Fixed a couple things to be more logical