Fix silly bug in wordyError. Some clean-ups