Removed vector, modified mult, added combine
Exposed combine, fixed rows/cols