more style updates and tweaks