Removed .c and .v for matrices, fixed matrices being NaN