Integrated more parameters, tried to fix locale stuff (without success)