some fixes and other changes after download from server