Fix else tag and added some highlighting options