language code and some markup fixes