Fix random hangups, bad data. Make it faster.