Bugfixes in OpenNLP spotter, extended Wikipedia heldout corpus for disambiguation tests.