Added string lexing and cleaned up includes