reorganization of the dictionary
removed tributaries and more
work on parser continues
minor corrections