Added some image fixes -- Commit 16

I think plugins will finally work.