Code

* deal properly with signals