Changed some conventions to accomodate row_iter. Some developments in row_iter.