added decs, and started the process of fixing a if-then-else shift/reduce bug