Matrix: Formatting changes, commentation
Build: Fix MSVC static builds