fixed the anchors bug and some improve