Final cleanup this branch

Absolutely the last checkin for this branch. spacing, fix bug introduced
to row iterator in display()