Bugfixes + minor language file modification