Various

Some changes. Matrix scope-exit crash debugging not complete.