NEG discuss

Some fixes after Thursday skype discussion with NEG