Crushed a few bugs.