Some fixes
ImageUtils
Big changes