few bug fixes, image change