add keys to rows, and clean up