cleaned up code, deleted dead code
fixed/implemented classifyAll function
added todos and fixmes, for next time