Added update timeout, thread joining, and settings.