Improved language mappings

Added a number of comments for problematic/unclear cases.