Added ns_tools, removed timeout, added some options