fixed some issues by adding more lexing