completely cleaned up grammar. Added all extra rules for hw4, still have issues on hw4