EXTRACT_CONTRIBDATA_GIVENDATA parsing language
rename some EX_*, new one added, test fixes