Fix Warnings
Add State matrix to Solver