quick first stab at pretty output (some is still ugly) :/