changed point add to be more elegant
minor tweaks