Updated default parameters, handled multiple dots
Generate dots when possible