Removed print, improved handling of NRW values, fixed dialyzer.