Fix signal handing
Reduced time to wait for exit