Grammar fixes and improvements for the new ACELP code