Improved install & upgrade