Fixing lingering bugs and cleaning up code.