refactoring negotiations for NVT
NAWS now works!