Merge pull request #1636 from Kenneth-T-Moore/bench

Some fixes for NREL modeling
another fix