numerous style tweaks