Redid signal handling. Much cleaner now because it doesn't send a QUIT signal to itself.