few fixes
Square brackets removed from lexer