Fix a newline bug with reserved words
Fix bug in handling of switch cases
Fix bug in handling of if statements