Minor bugfix and change to word gathering.