Fix class vs instance variables
Fixed testing code.
Added parsing quoted text and better word splitting
Small fixes