Some issues about the markers fixed.