add loader and bug fix