modify some little flaws