more style tweaks, starting to come together