columns.
lots of cleanup and prettiness.