Fixing Action Words [Work in Progress]

After latest merge to master, differing implementations of action words are causing problems, this is being resolved.