Added some missing characters, better reorganization by language