Else if rule added to parser and idention fixes