language code and some markup fixes
links fixes
Merge pull request #602 from astynax/master

language code and some markup fixes