increase some timeouts and signal properly