fixes, deconstruction and upgrade