Fix marker updated bug.
Marker name length bug fix.
Comments.
Merge