Changes, bugfixes, cleanup, localization update