Added upper bounds on matrix and column size.