if grammar validates successfully. Slight modifications and improvements to other files.