cleanup + row header fixes