A better house

Are these sentences correct:

1) When our work is done, this building will be a better building than you made it.
2) When our work is done, this building will be an even better building than you made it.

3) We'll make this building a better building than you made it.
4) We'll make this building an even better building than you made it.

Isn't it possible for each of them to have two meanings:

a) You made this building. It will become better/We will make it better
b) You made this building better. It will become even better/We will improve it more.

Gratefully,

Navi