changed marker size
merged stuff