fixes and clean on Point
clean up