cleanup in preparation for integration with release 0.3.3
got some more tests working, turned NER on