matrix: fix join, fix sync, remove debug, reindent
matrix: fix join, fix sync, remove debug, reindent

Former-commit-id: af30269f6949d586b3324be00b3e8d22e07bf058 [formerly b2e926e5eacb6ad29ba0ae22dc594479684bdef5]
Former-commit-id: 017b3888cd830c3aa4c2d4974c1ea01357e46198
haste/ivar2,torhve/ivar2,torhve/ivar2,torhve/ivar2