More grammar changes, introduced lambda, interface, modified match