Added reference returns for goniometer & its axes plus moved where the computation of the matrix occurs.