sailesh bug fixess

bugs issues by sailesh