Ironed out some more bugs.