MAT 1341A - More formatting and structure fixes