diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java
index 220f1361b..0bf341fae 100644
--- a/java/src/processing/mode/java/JavaEditor.java
+++ b/java/src/processing/mode/java/JavaEditor.java
@@ -295,12 +295,12 @@ public class JavaEditor extends Editor {
 
     item = new JMenuItem(Language.text("menu.help.environment"));
     //item.addActionListener(e -> showReference("environment/index.html"));
-    item.addActionListener(e -> Platform.openURL("https://processing.org/reference/"));
+    item.addActionListener(e -> Platform.openURL("https://processing.org/environment/"));
     menu.add(item);
 
     item = new JMenuItem(Language.text("menu.help.reference"));
     //item.addActionListener(e -> showReference("index.html"));
-    item.addActionListener(e -> Platform.openURL("https://processing.org/environment/"));
+    item.addActionListener(e -> Platform.openURL("https://processing.org/reference/"));
     menu.add(item);
 
     item = Toolkit.newJMenuItemShift(Language.text("menu.help.find_in_reference"), 'F');
diff --git a/todo.txt b/todo.txt
index c832e3790..03ae1f8f9 100755
--- a/todo.txt
+++ b/todo.txt
@@ -31,6 +31,8 @@ X remove underscore and use (half?) space for tabs?
 X   half space character not implemented, but the space looks good
 X   disable behavior with sketch.name.replace_underscore = false
 X add clean-libs target to build.xml files that need it
+X check all Help menu entries and their destinations
+X   Help > Environment not going to the right place
 
 naming
 X Friendly Names for new Sketches (includes UI for switching it back)
@@ -378,7 +380,7 @@ _   https://github.com/processing/processing4/issues/522
 _   https://github.com/processing/processing4-javafx/issues/15
 
 
-can wait until next release
+next release
 _ thicker version of the search icon for the status panel
 _   copy the icon over from the manager
 _ changing between themes not updating the combo box text (though arrow trigger works)
@@ -563,7 +565,6 @@ _ Help > Library/Tools reference links don't work
 _ Export to Application not working with the current video library
 _   https://github.com/processing/processing-video/issues/188
 _ loadShape(), show a warning when using style instead of presentation attributes
-_ change help menu links to go to newer FAQ and the rest
 _ better means of understanding Library/Mode/Tool usage
 _ jeditsyntax is a mess of old-style getModifiers()
 _   would like to switch this over, but needs to be tested a lot
@@ -584,6 +585,10 @@ _   is this still the case?
 _ chars[] array is never used in ascii video example
 _ ui scaling in the PDE is important for classes/seeing at a distance
 _ Export to Application was broken with OpenGL (Casey)
+_ add a version of this to the 4.x repo
+_   https://github.com/processing/processing/wiki/troubleshooting
+_   and update the Help menu to link to it
+_   and maybe the FAQ too?
 
 
 decisions before final 4.0 release