replaced sig setjmp/longjmp with default functions.
Updating: merging minor changes by WB