prototype TableRow cleaned up, and more clean ups.