fixed wrong marker and some bugs, and added correct-marker to addition