cleaned up nmap, added fields