More polling changes, working Scan utility