* fix word set, add remove?