Imagefactory implemented and constants fixed
Quick fix