changes related to gicmo's comments i.e. chekcing string equlality with == instead of using compare.