Fixing README, adding term list
Pre test-run fixes
Fixes after test run