Added data dictionary, small corrections in source code