fix default locale and scoping of comments