wip - fix word handling