Upgraded the Matrix Definition so it now contains a height and a widht rather than a size.
Also added some Style foo in the matrix.h