Fixed one bug, found another.