changing scatter to use rect/circle functions

this branch does not work yet