few issues fixed
few changes