Languages hierarchy and other fixes.