more fixes of whereto