Fixed some errors in the grammar decorations
Fixed an error that was causing if-elif-else blocks not to evaulate in mutual exclusion. This issue might be caused in other cases still, may have to be revisited.
Fixed another issue with evaluating if-then-else statements. The problem of passing 'unevaluated' conditions to other conditions was fixed.