The improvements (over $2500) are depreciated like the property over 27.5 years so you ARE in the right place ... keep going.
