Fixed support for saving state and now you can change language and it works. Cleaning of code still needs to be done