fixed bad error reporting
caching in context
put skip button back
batch matcher