Changed matrix element to Scalar
Cleaned up -Wall warnings
Updated depends