Fixed bugs; Added locale setting