allow hyphen in language, fix bug