Improve generate words/images lists, fix/improve code