That is great, but we shouldn't have to manually do anything for S-Corp basis other than keep track of it in the 1120S software, which should fully download into 1040 module.  All Excess Distributions and Excess SH Loan Repayments should be in the SH's 1040 module after the K-1 is imported from 1120S module.  The 1040 module should automatically limit based on the Basis Sch.