more language/formatting tweaks