improved --stop
updated screenshots