Lots of wordsub updates

Not finished yet, but I'm too tired to finish right now.