modified ast structures, and changed to match google c++ style conventions, by necessity changed peg file as well