Got rid of extraneous else block
Fixed a critical tag bug