added matcher, stubs for manual drafts
typos, errant debugger statement