changes to make npfs functional
Merge branch 'master' of github.com:eesi/Fizzy