various pretty print improvements