small fixes
graceful stop
Merge branch 'graceful-stop'