Fixed some bugs when a marker updates its model, final testing