diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
index 13bf8b9f3..22af5fb81 100644
--- a/core/src/processing/core/PApplet.java
+++ b/core/src/processing/core/PApplet.java
@@ -48,7 +48,7 @@ import java.util.zip.*;
  * be returning Java 1.1 support, which does not include Swing (without an
  * additional, sizable, download), and 2) Swing is a bloated piece of crap.
  * A Processing applet is a heavyweight AWT component, and can be used the
- * same as any other AWT component.
+ * same as any other AWT component, with or without Swing.
  * <p/>
  * Similarly, Processing runs in a Frame and not a JFrame. However, there's
  * nothing to prevent you from embedding a PApplet into a JFrame, it's just
diff --git a/core/todo.txt b/core/todo.txt
index 1b582a4c7..c285675b2 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -84,6 +84,8 @@ X   remove single pixel blend functions
 o   blend() should prolly have its mode be the first param
 X   move blend() to blendColor() when applying it to a color
 X added lerpColor(), though it needs a new name
+X went back to old image i/o (sometimes caused trouble when exported)
+X   http://dev.processing.org/bugs/show_bug.cgi?id=376
 
 more recent
 X only update mouse pos on moved and dragged
@@ -868,7 +870,7 @@ CORE / PImage
 _ don't grab pixels of java2d images unless asked
 _   this is the difference between a lot of loadPixels() and not
 _   so important to have it in before beta if that's the change
-
+_   http://dev.processing.org/bugs/show_bug.cgi?id=356
 _ add ability to control jpeg compression level with save() and saveFrame()
 _   http://dev.processing.org/bugs/show_bug.cgi?id=342
 _ also when drawing an image, sense whether drawn rotated
@@ -894,6 +896,8 @@ _   http://dev.processing.org/bugs/show_bug.cgi?id=343
 
 CORE / Mac OS X
 
+_ first line of applets is missing on java 1.4+ on the mac
+_   http://dev.processing.org/bugs/show_bug.cgi?id=283
 _ change how java version is determined on mac
 _   http://developer.apple.com/technotes/tn2002/tn2110.html
 _   (this tn provides no guidance for macos8/9.. gah)
diff --git a/todo.txt b/todo.txt
index 8810546ec..09fc3b6de 100644
--- a/todo.txt
+++ b/todo.txt
@@ -58,6 +58,9 @@ X   on export, need to first import applet's packages before qt et al
 X   video working in applets? (no, never did in alpha so untested)
 X     Movie should perhaps work?
 X   http://dev.processing.org/bugs/show_bug.cgi?id=44
+X capture.settings() changes size of capture
+X   http://dev.processing.org/bugs/show_bug.cgi?id=366
+X   fix submitted by hansi
 
 faq additions
 X add notes about sketchPath() and savePath() to library docs
@@ -73,7 +76,7 @@ X createGraphics with PDF, using dispose() to clear the thing
 X calling nextPage()
 _ under the memory section, getting free/total memory
 _   long allocated = Runtime.getRuntime().totalMemory()  (-Xms usually)
-_   long allocatedButFree = Runtime.getRuntime().freeMemory()  (-Xms minus used)
+_   long free = Runtime.getRuntime().freeMemory()  (-Xms minus used)
 _   long maximum = Runtime.getRuntime().maxMemory()  (-Xmx setting)
 X remove the memory setting stuff from the faq
 X   add more information about setting the memory
@@ -911,8 +914,6 @@ _ need to add resize method to camera capture
 _   http://processing.org/discourse/yabb_beta/YaBB.cgi?board=Syntax;action=display;num=1150227643
 _ need to prevent multiple QTSession open or close
 _   static method shared across the lib, or some such
-_ capture.settings() changes size of capture
-_   http://dev.processing.org/bugs/show_bug.cgi?id=366
 _ reading movie is really really slow (2-3 fps)
 _   possible improvement from qtjava list added
 _   http://dev.processing.org/bugs/show_bug.cgi?id=40
diff --git a/video/src/processing/video/Capture.java b/video/src/processing/video/Capture.java
index e9fca28fb..7661d8234 100755
--- a/video/src/processing/video/Capture.java
+++ b/video/src/processing/video/Capture.java
@@ -84,6 +84,8 @@ public class Capture extends PImage implements Runnable {
   /** the guy who's doing all the work */
   public SGVideoChannel channel;
 
+  /** boundary of image at the requested size */
+  protected QDRect qdrect;
 
   static {
     try {
@@ -141,7 +143,7 @@ public class Capture extends PImage implements Runnable {
     this.framerate = framerate;
 
     try {
-      QDRect qdrect = new QDRect(requestWidth, requestHeight);
+      qdrect = new QDRect(requestWidth, requestHeight);
       // workaround for bug with the intel macs
       QDGraphics qdgraphics = null; //new QDGraphics(qdrect);
       if (quicktime.util.EndianOrder.isNativeLittleEndian()) {
@@ -454,9 +456,18 @@ public class Capture extends PImage implements Runnable {
   public void settings() {
     try {
       // fix for crash here submitted by hansi (stop/startPreview lines)
-          capture.stop();
+      capture.stop();
+
+      // Whenever settingsDialog() is called, the boundries change,
+      // causing the image to be cropped. Fix for Bug #366
+      // http://dev.processing.org/bugs/show_bug.cgi?id=366
+      channel.setBounds(qdrect);
+
+      // open the settings dialog
       channel.settingsDialog();
-          capture.startPreview();
+      // start the preview again
+      capture.startPreview();
+
     } catch (StdQTException qte) {
       int errorCode = qte.errorCode();
       if (errorCode != Errors.userCanceledErr) {