updates from 2.0.1 package.  keeping this in sync
fix capture mode