Extend BDD quickSimplify a bit more.
Lots of timeout-related bug fixes.
Merge github.com:sos22/SLI