Image & Bug fixes