fixing language bug + merge from cwi + mine origin