old addWords fixed plus more.