merged v3.11

merged all of the changes of v3.11 into this fork, except the renaming
of the "current" (background thoughts) and the "todo" vars