add image and several fixes