Polish and a few more images