more editing of the vocabulary: added subject and lots of cross links