Start to refactoring code
Some fixes and refactoring,  and changes in traslations.