added naming to lexer rule
added additional syntax rule
more testing
fixed parser
bad test
added null checking