Fixed matrix mapping, changed a few slides