Changes to support adding new threads, minor change to menu