WordMap Updates

Fixing #1312 :smile: