Updated spredsheet NPV and IRR