Remove commented code
remove forgotten dependency on antlr
Improve handling of recursion 

and also cleanup the constants for the goals and the actions performed