add stop button for all cases, minor updates