fixed locale and some issues