initial changes

save clicked points correctly, batch