Bugfixes and improvements for the Image-Plugin