bug fix & screen-shot update