updated parser grammar
parser now fully functional