Improved command error displaying
Improved upgrade procedure