Adding Extra Link geom point method plus corrections/clean up