Started cleaning/tweaking matrix section