Small updates. Issue #3

this issue is for the unresolved shift/reduce and reduce/reduce
conflicts