Fix Matrix and stuff
next best commit