Shorter lock wait
Graceful interrupts
VERSION
Also remove lock file on exit_error
Also remove lock file on exit_error