Small updates.  No more commonjs.
Merged.