Corrected Matrix Class