Correcting lexing
Adding signal