Add Matrix, improve Polynomial
