fixed a merge error
fixed another merge bug
timing the classifier
merging in teddy's new iterator and my timing