npv fixes
multiple issues