Added signal=?
Added some more bells and whistles