diff --git a/build/shared/lib/defaults.txt b/build/shared/lib/defaults.txt
index c943119c8..e84204e01 100644
--- a/build/shared/lib/defaults.txt
+++ b/build/shared/lib/defaults.txt
@@ -9,7 +9,7 @@
 # Users -> [username] -> AppData -> Roaming ->
 #    Processing -> preferences.txt (on Windows 10)
 
-# ~/Library -> Processing -> preferences.txt (on Mac OS X)
+# ~/Library -> Processing -> preferences.txt (on macOS)
 
 # ~/.config/processing -> preferences.txt (on Linux)
 
@@ -29,14 +29,6 @@
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 
-# DEFAULT PATHS FOR SKETCHBOOK AND SETTINGS
-
-# relative paths will be relative to processing.exe or processing.app.
-# absolute paths may also be used.
-
-# note that this path should use forward slashes (like unix)
-# instead of \ on windows or : on macos or whatever else
-
 # If you don't want users to have their sketchbook default to
 # "My Documents/Processing" on Windows and "Documents/Processing" on OS X,
 # set this to another path that will be used by default.
@@ -50,24 +42,16 @@
 welcome.four.beta.show = true
 welcome.four.beta.seen = false
 
-# By default, no sketches currently open
-last.sketch.count = 0
-# true if you want sketches to re-open when you next run processing
-last.sketch.restore = true
-
 # set 'true' for the default behavior before 4.0b6
 editor.sync_folder_and_filename = true
 
-# by default, contributions are moved to backup folders when
-# they are removed or replaced. The locations of the backup
-# folders are:
-#              sketchbook/libraries/old
-#              sketchbook/tools/old
-#              sketchbook/modes/old
+# By default, contributions are moved to backup folders when
+# they are removed or replaced. The backups can be found at
+# sketchbook/libraries/old, sketchbook/tools/old, and sketchbook/modes/old
+
 # true to backup contributions when "Remove" button is pressed
 contribution.backup.on_remove = true
 # true to backup contributions when installing a newer version
-# (for example, from a plb file)
 contribution.backup.on_install = true
 
 recent.count = 10
@@ -85,9 +69,6 @@ chooser.files.native = true
 theme.gradient.method = rgb
 
 
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-
 # by default, check the processing server for any updates
 # (please avoid disabling, this also helps us know basic numbers
 # on how many people are using Processing)
@@ -99,9 +80,6 @@ platform.auto_file_type_associations = true
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-# default font used for UI elements (no longer in use as of beta 9)
-#ui.font.family = Dialog
-#ui.font.size = 12
 
 # default size for the main window
 editor.window.width.default = 700
@@ -207,11 +185,6 @@ run.options.memory = false
 run.options.memory.initial = 64
 run.options.memory.maximum = 512
 
-# By default, Mac OS X 10.6 launches applications in 32-bit mode,
-# which is more compatible with libraries (many have not updated to 64-bit).
-# Changing this doesn't do anything on other platforms.
-run.options.bits.macos = 32
-
 # Index of the display to use for running sketches (starts at 1).
 # Kept this 1-indexed because older vesions of Processing were setting
 # the preference even before it was being used.
@@ -323,4 +296,4 @@ pdex.completion.trigger = false
 # Suggest libraries to import when a class is undefined/unavailable
 pdex.suggest.imports = true
 # Set to false to disable ctrl/cmd-click jump to definition
-pdex.inspectMode.hotkey=true
+pdex.inspectMode.hotkey = true
diff --git a/todo.txt b/todo.txt
index a28183f4e..db1eaf909 100755
--- a/todo.txt
+++ b/todo.txt
@@ -49,6 +49,9 @@ X   https://github.com/processing/processing-examples
 X   can safely clone this repo instead of using processing-docs
 X 'chars' array is never used in ascii video example
 X   https://github.com/processing/processing-video/blob/master/examples/Capture/AsciiVideo/AsciiVideo.pde
+o auto-complete not auto-triggering, change pref for handling?
+o   Auto-completion: [ ] Disabled  [ ] Show on Ctrl-Space  [ ] Always show
+o   https://github.com/processing/processing/issues/5691
 
 temp
 X temp folders (particularly on Windows)
@@ -395,15 +398,10 @@ _ Export to Application not working with the current video library
 _   https://github.com/processing/processing-video/issues/188
 
 
-decisions before final 4.0 release
+would like to fix (but not necessary for 4.0 final)
 _ Remove “Disable HiDPI Scaling” preference on Windows?
 _   document it in the troubleshooting doc, ask people to report
-_ auto-complete not auto-triggering, change pref for handling?
-o   Auto-completion: [ ] Disabled  [ ] Show on Ctrl-Space  [ ] Always show
-_   https://github.com/processing/processing/issues/5691
-
-
-would like to fix (but not necessary for 4.0 final)
+_   put it into the Preferences page?
 _ adding a file to an untitled sketch should require a save
 _ Cannot type quotes with an international keyboard on MacOS
 _   fixed by turning on "Enable complex text input"
@@ -457,6 +455,7 @@ _   ideen2011.blogspot.de/2011/08/java-proxyselector-usesystemproxies-and.html
 _   malformed proxy issues http://stackoverflow.com/q/376101
 _   docs.oracle.com/javase/7/docs/api/java/net/doc-files/net-properties.html
 _   https://github.com/processing/processing/issues/1476#issuecomment-23229990
+_   https://github.com/processing/processing4/wiki/Preferences#proxies
 
 
 organize this mess into the sections below