In process (paranoid save) of Trim Image fixes. Working, but need final clean.