Everything is working perfectly as far as I can see.

Total UI gets included in MAGI for SS purposes.
CA has the automatic add-back like it should (Id been making the add back manually for over a week)