diff --git a/core/src/processing/javafx/PSurfaceFX.java b/core/src/processing/javafx/PSurfaceFX.java
index 1b70f0220..bf86a1a3d 100644
--- a/core/src/processing/javafx/PSurfaceFX.java
+++ b/core/src/processing/javafx/PSurfaceFX.java
@@ -45,7 +45,6 @@ import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import javafx.util.Duration;
-
 import processing.core.*;
 
 
@@ -679,7 +678,6 @@ public class PSurfaceFX implements PSurface {
   }
 
 
-  @SuppressWarnings("deprecation")
   protected void fxKeyEvent(javafx.scene.input.KeyEvent fxEvent) {
     int action = 0;
     EventType<? extends KeyEvent> et = fxEvent.getEventType();
@@ -714,6 +712,8 @@ public class PSurfaceFX implements PSurface {
                                                    keyChar, keyCode));
   }
 
+
+  @SuppressWarnings("deprecation")
   private int getKeyCode(KeyEvent fxEvent) {
     if (fxEvent.getEventType() == KeyEvent.KEY_TYPED) {
       return 0;
@@ -723,10 +723,14 @@ public class PSurfaceFX implements PSurface {
     switch (kc) {
       case ALT_GRAPH:
         return PConstants.ALT;
+      default:
+        break;
     }
     return kc.impl_getCode();
   }
 
+
+  @SuppressWarnings("deprecation")
   private char getKeyChar(KeyEvent fxEvent) {
     if (fxEvent.getEventType() == KeyEvent.KEY_TYPED) {
       return fxEvent.getCharacter().charAt(0);
@@ -779,9 +783,9 @@ public class PSurfaceFX implements PSurface {
         return PConstants.CODED;
       case ENTER:
         return '\n';
+      default:
+        break;
     }
-
     return kc.impl_getChar().charAt(0);
   }
-
 }
\ No newline at end of file
diff --git a/core/todo.txt b/core/todo.txt
index 603e36a03..9654ac4d8 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -22,6 +22,14 @@ X   https://github.com/processing/processing/pull/3686
 X   added note about AIOOBE seen earlier
 X Update LowLevelGL to use VBOs
 X   https://github.com/processing/processing-docs/pull/289
+X Remove legacy GL functions from PGL
+X   https://github.com/processing/processing/issues/3674
+X   https://github.com/processing/processing/pull/3691
+X   https://github.com/processing/processing/issues/3671
+X   https://github.com/processing/processing/issues/3621
+X "Internal graphics not initialized yet"
+X   https://github.com/processing/processing/issues/3690
+X   https://github.com/processing/processing/pull/3692
 
 cleaning
 X How do images behave when pixelDensity(2) is set?