add languages, some fixes, probably fix bug #19