Fixed two bugs, angular interpolation and missing second interpolation point for location