Fixed the image errors
Merged stuff