more tweaks, cleanup, adjustment, etc.  More stable, add more on image magic