Lots of meta data updates

Fixing terminology section slowly