Adjust some of the if positioning. OCD thing, heh.