various tweaks to styles and such