Followed your corrections. Finally got the IRS to accept federal return and now waiting for state to accept.
