Modified some vocabulary, added some preliminary doc