Q1) Yes, the IRS considers this all to be components of one major improvement.
Q2) Yes, you can depreciate up until the date of sale and the depreciation will be recaptured as ordinary income.
