Fixing input format to take allow cleaner syntax.  Removing productions out of nonterm and moving to grammar