Added languages and fixed a mnor issue