Fixed a bunch of shit.  Classifier still seems very broken; maybe we need to use an SVM?