Mandat 2: Language + fixes