Added some minor fixes. Started upgrading routine