fix user unfriendly issues