Added signal_deleted to subject, fixed some bugs