added language IDs, improved readability for some commands