Fixed Row names, minor changes