bunch of changes again
Change language
Fix message