improved matrix_with_names rendering. Added wrappers.