tons of improvements to style guide