Improved the default style a little.

And fixed bugs found doing so.