diff --git a/java/src/processing/mode/java/pdex/JavaTextArea.java b/java/src/processing/mode/java/pdex/JavaTextArea.java
index 7134df9f1..0e9d29b3f 100644
--- a/java/src/processing/mode/java/pdex/JavaTextArea.java
+++ b/java/src/processing/mode/java/pdex/JavaTextArea.java
@@ -37,7 +37,6 @@ import java.util.concurrent.ExecutionException;
 
 import javax.swing.DefaultListModel;
 import javax.swing.SwingWorker;
-import javax.swing.text.BadLocationException;
 
 import processing.app.Messages;
 import processing.app.Mode;
diff --git a/todo.txt b/todo.txt
index 4f5c2c6b1..70d24e327 100644
--- a/todo.txt
+++ b/todo.txt
@@ -26,6 +26,13 @@ X   checked code and this seems to be fine / can't reproduce
 X show hover text when the mouse is over the 'debug' button
 X update EditorButton rollover label when pressing shift or alt
 X welcome screen shows coffee cup icon on Windows
+o Hitting enter on code completion completes and then creates a new line
+X   https://github.com/processing/processing/issues/3741
+X ctrl-space first inserts space, then deletes it, with completion
+X   https://github.com/processing/processing/issues/3847
+o finish the gui
+X   https://github.com/processing/processing/issues/3072
+X   closing in favor of specific issues
 
 sketch modified
 X sketch modified externally with FAT32 volumes on OS X
@@ -69,6 +76,9 @@ X remove tooltip that repeats the contents of the tab labels
 X add extra space to the right of the buttons to line up w/ the scrollbar
 X CM: Button formatting
 X   https://github.com/processing/processing/issues/3643
+o Contributions Manager UI design
+X   https://github.com/processing/processing/issues/3482
+X   closing in favor of separate issues
 
 watcher
 X prevent re-prompting users when they say "no" to "sketch modified" message
@@ -97,15 +107,11 @@ jakub
 X Make preprocessor scope-aware
 X   https://github.com/processing/processing/issues/3799
 X   https://github.com/processing/processing/pull/3810
-_ auto-complete is a mess (and broken on OS X)
+X auto-complete timing issues
 _   https://github.com/processing/processing/issues/3812
 X   https://github.com/processing/processing/pull/3845
-_ Hitting enter on code completion completes and then creates a new line
-_   https://github.com/processing/processing/issues/3741
-_   found thread deadlock issues preventing it from working on OS X
 _ Red error underline is sometimes at wrong location
 _   https://github.com/processing/processing/issues/3759
-_ ctrl-space first inserts space, then deletes it, with completion
 
 
 known issues
@@ -145,13 +151,23 @@ _   https://github.com/processing/processing/issues/3665
 gui / 3.0 final
 _ show number of updates available in the footer
 _   https://github.com/processing/processing/issues/3518
-_ finish the gui
-_   https://github.com/processing/processing/issues/3072
+_ different design of squiggly line
+_   easy to do inside JavaTextAreaPainter.paintSquiggle()
+
+
+manager / 3.0 final
+_ CM selected tabs are too tall 
+_   https://github.com/processing/processing/issues/3598
+_ updates tab has ugly horizontal line at top
+_ status/name/author table header is alternating color
+_   area above scroll bar looks like more scroll bar
+_ remove focus blue from the scrollable list
+_ scrolling "past" top/bottom causes the screen to jiggle (OS X and Trackpad)
+_   looks like ContributionListing.getScrollableUnitIncrement() returns early
+_ total number of updates available is not correct
 
 
 gui / post 3.0
-_ different design of squiggly line
-_   easy to do inside JavaTextAreaPainter.paintSquiggle()
 _ build custom scroll bar since the OS versions are so ugly?
 _ error/warning location is awkward when no scroll bar is in use
 _   when only one screen-full, show ticks at exact location
@@ -172,20 +188,6 @@ _   rather than post-compile
 _   https://github.com/processing/processing/issues/136
 
 
-manager
-_ CM selected tabs are too tall 
-_   https://github.com/processing/processing/issues/3598
-_ updates tab has ugly horizontal line at top
-_ status/name/author table header is alternating color
-_   area above scroll bar looks like more scroll bar
-_ remove focus blue from the scrollable list
-_ scrolling "past" top/bottom causes the screen to jiggle (OS X and Trackpad)
-_   looks like ContributionListing.getScrollableUnitIncrement() returns early
-_ total number of updates available is not correct
-_ Contributions Manager UI design
-_   https://github.com/processing/processing/issues/3482
-
-
 manager / post 3.0
 _ Examples window closes and re-opens during library install/remove
 _   https://github.com/processing/processing/issues/3304