numerous stye tweaks
more style tweaks