add locale and fix comments