Fix for bug that was introduced.
Add topic to command line options.
More bad end words and possibly a fix for a weird bug.