More commenting in lexicon and minor restructuring.