Add screenhot, fix bugs