Yes, the information should be on your tax return for the years in question. Regarding the windows, they still count as improvements but you have to reduce their cost by the amount of the tax credit.
