Added elses to if statements. Introduces some serious potential parsing bugs.