more pretty print tweaks for better display in UI