Better word boundries, need to fix punctuation