Touched up on the TOOD: Roadmap, some inner squishy details
Hopefully fixed race condition once and for all!

Fixes #2. I like it when issue numbers are low.