cleaned up a bunch, better router mac detection, got rid of dnsMAC check