Some changes MadSci suggested

He's still stying away, but he gave useful input. TY MadSci.