Removed bufkill, added more nmap's