Fixed another major bug or two.