minor bugs removed
few changes