Fix order of sigint trap setup.
Fix order of kill/term.
Add better handling of timeout after sigint on stop.
Bump version.