Corrected Makefile to now appropriate have link dependencies and merged changes of matrix.h
Some changes were not pulled from origin, pulled other renamed to rhs changes.