Major upgrade near finished - some hiccups remain inevitable