more bug fixes for row