style tweaks, fixes