Better error logging, fixed bug with cash flow estimator