tons of minor tweaks and style fixes