Adapting the call to receive an array of word types
Bugfixes and handling of more special cases