Adding some images
Fix minor interface issue