Added TODO
Added Grammar.toString() + some refactoring and TODOs.