Added screenshot + minor fixes