Some minor changes to try to make the default output as close as possible to what Erica will need.