Fixes to use bow instead of tf*idf and other tweaks