Matrix, fixes, cleanup etc
Merge remote-tracking branch 'origin/master'
Matrix, fixes, cleanup etc