add some work items, adjust some OR wording
Merge commit 'ab0d8d5'