Correction of small typos/inconsistencies and add some rules (open statement, conditional matching-pattern).