Matrix and CrsMatrix
various fixes