add loading and some hotfix