bulk changes.  Mostly to for the print to work nicely.
If stuff starts going weird I would look towards this commit