Made significant changes on WaterLexer. See WaterLexerTest.