updating grammar to use correct left factor
fixed s and sPrime to fit new grammar