some minor updates
add cash_on_cash_return logic