Basic changes
Reformat
Matrix fixes part 1
Matrix fixes part 2
Algo builds