Okay, for real, this time; cleaned a couple things up.