Updated license
Locale settings and general refactoring