diff --git a/doc/BUGS b/doc/BUGS
index 4ae71a9ce..9ba281b00 100644
--- a/doc/BUGS
+++ b/doc/BUGS
@@ -58,6 +58,9 @@ Crashes
 - Shutdown is still flaky. (see notes)
 - Segfault on subsonic when clicking next track
 - Assertion failure on subsonic with debug build
+- Hang in logging.shutdown when quitting if started via a .bat file on Windows
+  (if we deactivate the atexit hook, hang in threading._shutdown).
+  However, only the MainThread is active when doing sys.exit.
 
 Qt warnings
 -----------
diff --git a/doc/TODO b/doc/TODO
index 5b6c85268..a98c3d306 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -105,6 +105,7 @@ Improvements / minor features
 - Add FIFOHandler based on asyncio if it's available
 - Lazy tab loading
 - Add command shortcuts to command completion
+- Add commandline option to not spawn any windows (for testing)
 
 hints
 -----