Business & farm

This is so confusing to a non Accountant, who just wants to file their Business Taxes.  Return is due March 15th, and I have been watching these conversations about PPP and how it should appear and what overrides can be done.  The same as other users, when I override, I get errors, etc.  I have tried answering NO to PPP loan question and all shows up on M1 and M2 as expected.  I have tried answering YES to PPP Loan, This results in a loss for the year, and the PPP loan, but nothing appears in M2 Line 5 Column D.  Depending which way I do this, changes the M1, M2 & K1, plus sometimes the Balance Sheet will not reconcile.  IS TURBOTAX GOING TO UPDATE THE PROGRAM TO HANDLE THIS CORRECTLY AND WHEN CAN WE EXPECT THAT?