 * Fixed an error message wrongly popping up in some cases
 * Some stabiliy and translation improvements
