more stylization changes and tweaks