Filling the matrix and constructors fix

Note: node_status is currently unused, I think it should be dropped.