added locale-switch, fixed locale issues..some