Fixed remaining couple of problems. We now have zero bugs.