More progress on the client and DNS scanning