Improve shutdown output
Change shutdown behaviour