Date Filtration

I used this formula to generate a table showing the active locked pipline though the past few months to today.

-------------------------------------------------------------------

LockDatesTable = GENERATE(
CALENDAR(DATE(2018,1,1),TODAY()),
FILTER(
'Merge1',
[Date]>='Merge1'[Loan.LockStartDate] &&
[Date]< IF(ISBLANK('Merge1'[Status.FundingDate]),TODAY()+1,'Merge1'[Status.FundingDate])
)
)

------------------------------------------------------------------

I have a few more conditions that I need to filter and am not sure how to go about this.

How would I add these conditions to the existing filter?

"or if Lock Expiration date is earlier than or equal to today and the funding date is blank only show in the table from lock start date to the lock expiration date."

"or if Lock Cancelation Date is not blank only show in the table from lock start date until teh lock cancelled date"

Any help is appreciated. Thanks