Changed a couple of Matrix names
Adding touch support