improve shutdown
tweak output