fixed some signaling issues