Christopher Gross

Pushed up a new version, up to date w/ latest in integration and fixes for the things mentioned here.

Fixed the last few things -- a few comments were hidden.