updated NF parameters (again)
update merge comments
whitespace
switch to c-signal proxy by default