Added screenshot and fixed a few bugs