BRRRR Calculator - Are some calculations just wrong?

[Neddie Smith]

Warning: Newbie questions contained below :)

I have been testing the BRRRR Calculator and my train of thought tells me two values should be calculated differently.

Calculation 1: Rehab - Total Cash Outlay

Currently this field does not seem to add Aquisition Loan Points/Fees to the Total Cash Outlay. Is this correct or am I missing something?

Calculation 2: Refinance -  Total Cash Invested

The equation seems to be: Total Cash Needed At Purchase - (Refinance loan amount - Purchase Loan amount)

My thinking is Total Cash Needed at Purchase should be exchanged for Total cash outlay because the purchase loan is being repaid with CASH during the rehab phase. The CoC of course would be affected here.

Let me know if I am just overthinking this. 

Cheers