Regarding the additional $1,000 contribution, that would have to be to your spouse's HSA, not to yours. If you have a W-2 that shows and amount in box 12 with code W, make sure that you have not also reported that amount as a personal contribution.
