started working on shift reduce conflicts and fixed a couple other errors